Remove deprecated GtkFileChooser functions

diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index b7227a0becb901d1b4ad75f40ffc16e6a3c0cc1a..439e3ded688ca17745faf559cff8bde13ee3388b 100644 (file)
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -820,10 +820,6 @@ gtk_file_chooser_button_set_property (GObject      *object,
       fs_bookmarks_changed_cb (priv->fs, button);
       break;
 
-    case GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND:
-      /* Ignore property */
-      break;
-
     case GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE:
       g_warning ("%s: Choosers of type `%s` do not support selecting multiple files.",
                 G_STRFUNC, G_OBJECT_TYPE_NAME (object));
@@ -856,7 +852,6 @@ gtk_file_chooser_button_get_property (GObject    *object,
 
     case PROP_TITLE:
     case GTK_FILE_CHOOSER_PROP_ACTION:
-    case GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND:
     case GTK_FILE_CHOOSER_PROP_FILTER:
     case GTK_FILE_CHOOSER_PROP_LOCAL_ONLY:
     case GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET:
@@ -2738,33 +2733,6 @@ gtk_file_chooser_button_new (const gchar          *title,
                       NULL);
 }
 
-/**
- * gtk_file_chooser_button_new_with_backend:
- * @title: the title of the browse dialog.
- * @action: the open mode for the widget.
- * @backend: the name of the #GtkFileSystem backend to use.
- * 
- * Creates a new file-selecting button widget using @backend.
- * 
- * Returns: a new button widget.
- * 
- * Since: 2.6
- * Deprecated: 2.14: Use gtk_file_chooser_button_new() instead.
- **/
-GtkWidget *
-gtk_file_chooser_button_new_with_backend (const gchar          *title,
-                                         GtkFileChooserAction  action,
-                                         const gchar          *backend)
-{
-  g_return_val_if_fail (action == GTK_FILE_CHOOSER_ACTION_OPEN ||
-                       action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, NULL);
-
-  return g_object_new (GTK_TYPE_FILE_CHOOSER_BUTTON,
-                      "action", action,
-                      "title", (title ? title : _(DEFAULT_TITLE)),
-                      NULL);
-}
-
 /**
  * gtk_file_chooser_button_new_with_dialog:
  * @dialog: the widget to use as dialog

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 429e8c4df0c74728afaffd3f8f64fc5f324470f3..114e37109d84cf1f48350b7377bbc786af2e0041 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -5440,10 +5440,6 @@ gtk_file_chooser_default_set_property (GObject      *object,
       }
       break;
 
-    case GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND:
-      /* Ignore property */
-      break;
-
     case GTK_FILE_CHOOSER_PROP_FILTER:
       set_current_filter (impl, g_value_get_object (value));
       break;

diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c
index 43a11ce037dcc46a8f925c4e5d3238e8893dd385..327b865d6e4b2f2347d592b70957ca1859dec3c2 100644 (file)
--- a/gtk/gtkfilechooserdialog.c
+++ b/gtk/gtkfilechooserdialog.c
@@ -308,10 +308,6 @@ gtk_file_chooser_dialog_set_property (GObject         *object,
 
   switch (prop_id)
     {
-    case GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND:
-      g_free (priv->file_system);
-      priv->file_system = g_value_dup_string (value);
-      break;
     default:
       g_object_set_property (G_OBJECT (priv->widget), pspec->name, value);
       break;
@@ -468,44 +464,5 @@ gtk_file_chooser_dialog_new (const gchar         *title,
   return result;
 }
 
-/**
- * gtk_file_chooser_dialog_new_with_backend:
- * @title: (allow-none): Title of the dialog, or %NULL
- * @parent: (allow-none): Transient parent of the dialog, or %NULL
- * @action: Open or save mode for the dialog
- * @backend: The name of the specific filesystem backend to use.
- * @first_button_text: (allow-none): stock ID or text to go in the first button, or %NULL
- * @Varargs: response ID for the first button, then additional (button, id) pairs, ending with %NULL
- *
- * Creates a new #GtkFileChooserDialog with a specified backend. This is
- * especially useful if you use gtk_file_chooser_set_local_only() to allow
- * non-local files and you use a more expressive vfs, such as gnome-vfs,
- * to load files.
- *
- * Return value: a new #GtkFileChooserDialog
- *
- * Since: 2.4
- * Deprecated: 2.14: Use gtk_file_chooser_dialog_new() instead.
- **/
-GtkWidget *
-gtk_file_chooser_dialog_new_with_backend (const gchar          *title,
-                                         GtkWindow            *parent,
-                                         GtkFileChooserAction  action,
-                                         const gchar          *backend,
-                                         const gchar          *first_button_text,
-                                         ...)
-{
-  GtkWidget *result;
-  va_list varargs;
-  
-  va_start (varargs, first_button_text);
-  result = gtk_file_chooser_dialog_new_valist (title, parent, action,
-                                              backend, first_button_text,
-                                              varargs);
-  va_end (varargs);
-
-  return result;
-}
-
 #define __GTK_FILE_CHOOSER_DIALOG_C__
 #include "gtkaliasdef.c"

diff --git a/gtk/gtkfilechooserdialog.h b/gtk/gtkfilechooserdialog.h
index d79f6f89a71aed25e185bb30976fe6aaab4317d6..12b90e0c7254ad1e9b838a4a46e33e4bbfd4e4ba 100644 (file)
--- a/gtk/gtkfilechooserdialog.h
+++ b/gtk/gtkfilechooserdialog.h
@@ -60,15 +60,6 @@ GtkWidget *gtk_file_chooser_dialog_new              (const gchar          *title
                                                     const gchar          *first_button_text,
                                                     ...) G_GNUC_NULL_TERMINATED;
 
-#ifndef GTK_DISABLE_DEPRECATED
-GtkWidget *gtk_file_chooser_dialog_new_with_backend (const gchar          *title,
-                                                    GtkWindow            *parent,
-                                                    GtkFileChooserAction  action,
-                                                    const gchar          *backend,
-                                                    const gchar          *first_button_text,
-                                                    ...) G_GNUC_NULL_TERMINATED;
-#endif /* GTK_DISABLE_DEPRECATED */
-
 G_END_DECLS
 
 #endif /* __GTK_FILE_CHOOSER_DIALOG_H__ */

diff --git a/gtk/gtkfilechooserutils.c b/gtk/gtkfilechooserutils.c
index 69c71d111614028f8c93547c11b7b7f2bda399f5..1f0847bf9dac0e06f2d63da4b6165e1944bf5360 100644 (file)
--- a/gtk/gtkfilechooserutils.c
+++ b/gtk/gtkfilechooserutils.c
@@ -90,9 +90,6 @@ _gtk_file_chooser_install_properties (GObjectClass *klass)
   g_object_class_override_property (klass,
                                    GTK_FILE_CHOOSER_PROP_EXTRA_WIDGET,
                                    "extra-widget");
-  g_object_class_override_property (klass,
-                                   GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND,
-                                   "file-system-backend");
   g_object_class_override_property (klass,
                                    GTK_FILE_CHOOSER_PROP_FILTER,
                                    "filter");

diff --git a/gtk/gtkfilechooserutils.h b/gtk/gtkfilechooserutils.h
index a590cccd16f2806defe38930fd91a49e2214754c..2aff40639a9772c22efa6721b9b8f1e311ad642f 100644 (file)
--- a/gtk/gtkfilechooserutils.h
+++ b/gtk/gtkfilechooserutils.h
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
 typedef enum {
   GTK_FILE_CHOOSER_PROP_FIRST                  = 0x1000,
   GTK_FILE_CHOOSER_PROP_ACTION                 = GTK_FILE_CHOOSER_PROP_FIRST,
-  GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND,
+  /* GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND, */
   GTK_FILE_CHOOSER_PROP_FILTER,
   GTK_FILE_CHOOSER_PROP_LOCAL_ONLY,
   GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET, 

diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index d69d8542b2d7702a8dccac3af4944e9163bdc8ee..ca37b17936fa71bf74fe6da890dd42febe81b7f9 100644 (file)
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -126,10 +126,6 @@ gtk_file_chooser_widget_set_property (GObject         *object,
 
   switch (prop_id)
     {
-    case GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND:
-      g_free (priv->file_system);
-      priv->file_system = g_value_dup_string (value);
-      break;
     default:
       g_object_set_property (G_OBJECT (priv->impl), pspec->name, value);
       break;
@@ -167,30 +163,5 @@ gtk_file_chooser_widget_new (GtkFileChooserAction action)
                       NULL);
 }
 
-/**
- * gtk_file_chooser_widget_new_with_backend:
- * @action: Open or save mode for the widget
- * @backend: The name of the specific filesystem backend to use.
- * 
- * Creates a new #GtkFileChooserWidget with a specified backend.  This is
- * especially useful if you use gtk_file_chooser_set_local_only() to allow
- * non-local files.  This is a file chooser widget that can be embedded in
- * custom windows and it is the same widget that is used by
- * #GtkFileChooserDialog.
- * 
- * Return value: a new #GtkFileChooserWidget
- *
- * Since: 2.4
- * Deprecated: 2.14: Use gtk_file_chooser_widget_new() instead.
- **/
-GtkWidget *
-gtk_file_chooser_widget_new_with_backend (GtkFileChooserAction  action,
-                                         const gchar          *backend)
-{
-  return g_object_new (GTK_TYPE_FILE_CHOOSER_WIDGET,
-                      "action", action,
-                      NULL);
-}
-
 #define __GTK_FILE_CHOOSER_WIDGET_C__
 #include "gtkaliasdef.c"

diff --git a/gtk/gtkfilechooserwidget.h b/gtk/gtkfilechooserwidget.h
index 333531f573c5d5a4169df89cc9c64b660e2a0ca3..3b970f3094cd95a760ffa7404a4cb46629f5d377 100644 (file)
--- a/gtk/gtkfilechooserwidget.h
+++ b/gtk/gtkfilechooserwidget.h
@@ -56,12 +56,6 @@ struct _GtkFileChooserWidgetClass
 GType      gtk_file_chooser_widget_get_type         (void) G_GNUC_CONST;
 GtkWidget *gtk_file_chooser_widget_new              (GtkFileChooserAction  action);
 
-
-#ifndef GTK_DISABLE_DEPRECATED
-GtkWidget *gtk_file_chooser_widget_new_with_backend (GtkFileChooserAction  action,
-                                                    const gchar          *backend);
-#endif /* GTK_DISABLE_DEPRECATED */
-
 G_END_DECLS
 
 #endif /* __GTK_FILE_CHOOSER_WIDGET_H__ */